# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.884.38.1 -> 1.884.38.2 # arch/i386/kernel/setup.c 1.50.3.4 -> 1.50.3.5 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/09 agrover@groveronline.com 1.884.39.1 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 03/01/10 marcus@ingate.com 1.884.37.2 # [NETFILTER]: ipt_multiport invert fix # -------------------------------------------- # 03/01/10 gandalf@wlug.westbo.se 1.884.37.3 # [NETFILTER]: Fix a locking bug in ip_conntrack_proto_tcp. # -------------------------------------------- # 03/01/10 laforge@gnumonks.org 1.884.37.4 # [NETFILTER]: This patch fixes the ULOG target when logging packets without any # ethernet header (mac address). # -------------------------------------------- # 03/01/10 netfilter@interlinx.bc.ca 1.884.37.5 # [NETFILTER]: UDP nat helper support. # -------------------------------------------- # 03/01/10 kaber@trash.net 1.884.37.6 # [NETFILTER]: Fix ipt_REJECT udp checksums. # -------------------------------------------- # 03/01/10 kadlec@blackhole.kfki.hu 1.884.37.7 # [NETFILTER]: Fix excess logging of reused FTP expectations. # -------------------------------------------- # 03/01/10 kaber@trash.net 1.884.37.8 # [NETFILTER]: Fix incremental TCP checksum in ECN module. # -------------------------------------------- # 03/01/10 filip.sneppe@cronos.be 1.884.37.9 # [NETFILTER]: ip_conntrack_ftp.c, fixes a typo in a DEBUG statement. # -------------------------------------------- # 03/01/10 robert.olsson@data.slu.se 1.884.37.10 # [NAPI]: Discuss some more issues in driver HOWTO. # -------------------------------------------- # 03/01/10 linux-bt.adm@hostme.bitkeeper.com 1.884.40.1 # Merge hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.4 # into hostme.bitkeeper.com:/ua/repos/l/linux-bt/marcel-2.4 # -------------------------------------------- # 03/01/11 randy.dunlap@verizon.net 1.884.36.5 # [PATCH] usb-skeleton MINOR_BASE change # # USB_SKEL_MINOR_BASE should be a multiple of 16 to work # correctly with the way that minors are assigned (in blocks # of 16) in Linux 2.4.x. # -------------------------------------------- # 03/01/12 greg@kroah.com 1.884.36.6 # [PATCH] USB bluetooth: fix incorrect url in help text. # -------------------------------------------- # 03/01/12 kai@tp1.ruhr-uni-bochum.de 1.884.41.1 # ISDN: Remove unfinished driver # # Support for some Sun workstations' built-in ISDN is unfinished and hasn't # been worked on for years. Remove the associated files, which are not even # selectable during the build anyway. # # (Wolfgang Mües) # -------------------------------------------- # 03/01/12 spse@secret.org.uk 1.884.36.7 # [PATCH] USB: Backport konicawc driver to 2.4 # # This patch adds support for webcams based on a konica chipset # (eg Intel YC76). It is a backport from 2.5 # -------------------------------------------- # 03/01/13 bjorn_helgaas@hp.com 1.884.35.24 # ia64: smp_threads_ready: make non-volatile. # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.1 # [PATCH] PATCH: fix packet padding on the 3c507 # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.2 # [PATCH] PATCH: fix packet padding on the 3c523 # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.3 # [PATCH] PATCH: fix packet padding on the 7990 # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.4 # [PATCH] PATCH: fix packet padding on the 8139too # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.5 # [PATCH] PATCH: fix 8390 packet padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.6 # [PATCH] PATCH: fix packet padding on at1700 # # Wants double checking for endianness etc # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.7 # [PATCH] PATCH: fix packet padding on atp # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.8 # [PATCH] PATCH: fix de600/20 packet padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.9 # [PATCH] PATCH: fix ni5010 packet padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.10 # [PATCH] PATCH: fix ni52 packet padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.11 # [PATCH] PATCH: fix packet padding on ni65 # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.12 # [PATCH] PATCH: fix packet padding on axnet_cs # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.13 # [PATCH] PATCH: fix padding on sgiseeq # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.14 # [PATCH] PATCH: fix sk_g16 padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.15 # [PATCH] PATCH: fix sun3_82586 padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.16 # [PATCH] PATCH: fix sun3lance packet padding # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.17 # [PATCH] PATCH: further dscc4 updates # # kdiff -u --new-file --recursive --exclude-from /usr/src/exclude linux.21pre3/drivers/net/wan/dscc4.c linux.21pre3-ac1/drivers/net/wan/dscc4.c # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.18 # [PATCH] PATCH: document undocumentend field in SCSI headers # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.19 # [PATCH] PATCH: fix ad1889 warning - void functions dont return values # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.20 # [PATCH] PATCH: more unusual USB storage devices # # IBM memory key # Epson 785EPX PCMCIA slot # Konica KD-200Z camera # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.21 # [PATCH] PATCH; cut the mount hash table down to a sane size, and fix printk # # Been in -ac a while and is safe (one page is a value it can end up with # anyway) # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.22 # [PATCH] PATCH: fix casting in pci dma # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.23 # [PATCH] PATCH: parisc header update # # -------------------------------------------- # 03/01/14 alan@lxorguk.ukuu.org.uk 1.884.42.24 # [PATCH] PATCH: fix msdos end markers for compatibility with cameras etc # # Already in 2.5 # (Resend) # -------------------------------------------- # 03/01/14 stelian@popies.net 1.884.42.25 # [PATCH] sonypi driver update # # Hi, # # This little patch (present in 2.5) changes the way button release events # are reported by the sonypi driver to the application: previously, # separate release events were detected for each button. However, many # buttons (example: the jogdial, the capture button, the back button etc) # share the same release event. # # The attached patch propagates a single 'ANYBUTTON_RELEASED' event # to the userspace, leaving all state machine intelligence to the # application. # # Kunihiko IMAI should be credited for his ideas and tests. # # Alan, Marcelo, please apply. # # Thanks, # # Stelian. # # ===== include/linux/sonypi.h 1.7 vs edited ===== # -------------------------------------------- # 03/01/14 engebret@us.ibm.com 1.884.42.26 # [PATCH] PPC64 update # # Marcelo, # # Attached is a patch to update ppc64 to 2.4.21-pre3. Sorry to get behind on # this - our team was pretty much consumed with getting the UnitedLinux ppc64 # implementation solid the last few months. # # Also, we are hopefully getting a BK repository setup for 2.4 soon, so with # luck, this will be the last non-bk patch. Thanks for your patience. # -------------------------------------------- # 03/01/14 khalid_aziz@hp.com 1.884.42.27 # [PATCH] Avoid ide-scsi from starting DMA too soon # # ide-scsi driver starts DMA as soon as it writes the ATAPI PACKET command # in command register and before sending the ATAPI command. This will # cause problems on many drives. Right way to do it is to start DMA after # sending the ATAPI command. I am attaching a patch that fixes this. This # patch will allow many more CD-RW drives to work reliably in DMA mode # than do today. # -------------------------------------------- # 03/01/14 vandrove@vc.cvut.cz 1.884.42.28 # [PATCH] Fix non-G450/G550 build of matroxfb # # Use g450/g550 related code only if we are building driver supporting # g450/g550. Otherwise we end up with couple of undefined symbols # related to the G450 PLL. # # Thanks, # Petr Vandrovec # vandrove@vc.cvut.cz # -------------------------------------------- # 03/01/14 jfs.adm@hostme.bitkeeper.com 1.894 # Merge bk://linux.bkbits.net/linux-2.4 # into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.4 # -------------------------------------------- # 03/01/14 bunk@fs.tum.de 1.884.42.29 # [PATCH] remove duplicate entries from Configure.help # # Hi Marcelo, # # the patch below removes copies of the help texts for four options that # were listed twice in Configure.help # # Please apply # Adrian # -------------------------------------------- # 03/01/14 maxk@qualcomm.com 1.884.40.2 # Merge bk://linux-bt.bkbits.net/marcel-2.4 # into qualcomm.com:/usr/src/linux-2.4 # -------------------------------------------- # 03/01/15 henning@meier-geinitz.de 1.884.36.8 # [PATCH] : scanner.h, scanner.c: New vendor/product ids for visioneer scanners # # This patch adds vendor/product ids for two Visioneer scanners. # -------------------------------------------- # 03/01/15 henning@meier-geinitz.de 1.884.36.9 # [PATCH] scanner.c: print user-supplied ids only on start-up # # With this patch, information about user-supplied ids is printed only # once at startup instead of everytime any USB device is plugged in. # # The patch is on top of the new ids patch. # -------------------------------------------- # 03/01/15 henning@meier-geinitz.de 1.884.36.10 # [PATCH] scanner.c, scanner.h: Remove PV8630 ioctls # # This patch removes the inofficial ioctls that were used to support the # PV8630 USB-over-Parport chipset. They were already ifdefed out. # Instead of them, the more generic (and official) SCANNER_IOCTL_CTRLMSG # should be used. The last software that used the old ioctl # (sane-hp4200) switched to the new ioctls a long time ago. # # This patch is ontop of the "user-supplied" patch. # -------------------------------------------- # 03/01/15 henning@meier-geinitz.de 1.884.36.11 # [PATCH] scanner.c: endpoint detection cleanup # # This patch makes endpoint detection more generic. Basically, only one # bulk-in endpoint is required, everything else is optional. # # The patch is on top of the PV8630 removal patch. # -------------------------------------------- # 03/01/15 henning@meier-geinitz.de 1.884.36.12 # [PATCH] Add maintainer for USB scanner driver # -------------------------------------------- # 03/01/15 greg@kroah.com 1.884.42.30 # Merge kroah.com:/home/linux/linux/BK/bleeding-2.4 # into kroah.com:/home/linux/linux/BK/gregkh-2.4 # -------------------------------------------- # 03/01/15 agrover@groveronline.com 1.884.43.1 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 03/01/15 agrover@groveronline.com 1.884.43.2 # ACPI: Fix acpiphp_glue.c for latest ACPI struct changes (Sergio Visinoni) # -------------------------------------------- # 03/01/15 agrover@groveronline.com 1.884.43.3 # ACPI: Boot functions don't use cmdline, so don't pass it # -------------------------------------------- # 03/01/15 valko@linux.karinthy.hu 1.884.33.3 # [SPARC64]: Handle SO_TIMESTAMP properly in compat recvmsg. # -------------------------------------------- # 03/01/16 greg@kroah.com 1.884.42.31 # USB: Move the scanner ioctls to usb_scanner_ioctl.h to allow access by archs that need it. # # Specifically arches that need to thunk between a 32 bit userspace # and a 64 bit kernel. # # Thanks to Dave Miller for proding me to make this change. # -------------------------------------------- # 03/01/16 ganesh@tuxtop.vxindia.veritas.com 1.884.42.32 # [PATCH] Added ids for the Dell Axim and Toshiba E740. Thanks to Ian Molton # -------------------------------------------- # 03/01/16 gibbs@overdrive.btc.adaptec.com 1.884.1.92 # Merge http://linux.bkbits.net/linux-2.4 # into overdrive.btc.adaptec.com:/usr/home/gibbs/bk/linux-2.4 # -------------------------------------------- # 03/01/16 scott.feldman@intel.com 1.884.44.1 # [netdrvr e100] Sync 2.4.x driver with 2.5.x driver. # -------------------------------------------- # 03/01/16 scott.feldman@intel.com 1.884.44.2 # [netdrvr e100] udelay a better way # * Bug Fix: TCO workaround after hard reset of controller to wait for TCO # traffic to settle. Workaround requires issuing a CU load base command # after hard reset, followed by a wait for scb and finally a wait for # TCO traffic bit to clear. Affects 82559s and above wired to SMBus. # -------------------------------------------- # 03/01/16 scott.feldman@intel.com 1.884.44.3 # [netdrvr e100] standardize nic-specific stats output # # * Remove /proc/net/PRO_LAN_Adapters support # * Add ethtool GSTATS support # -------------------------------------------- # 03/01/16 scott.feldman@intel.com 1.884.44.4 # [netdrvr e100] fix TxDescriptor bit setting # # The i-bit wasn't being cleared correctly, so if TxDescriptors is # prime (worse case) to TX_FRAME_CNT, then the i-bit gets set on # every descriptor after a couple of passes through # the ring. This is equivalent to setting TX_FRAME_CNT=1. # -------------------------------------------- # 03/01/16 jgarzik@redhat.com 1.884.44.5 # [netdrvr tg3] s/spin_lock/spin_lock_irqsave/ in tg3_poll and tg3_timer # # The tg3_timer one is very likely superfluous, and will hopefully be # removed after extended testing. # -------------------------------------------- # 03/01/16 jgarzik@redhat.com 1.884.44.6 # [netdrvr tg3] Better interrupt masking # # The bcm570x chips provide a register that disables (masks) or enables # interrupts, and as a side effect, each write to this register regardless # of value clears various PCI and internal interrupt-pending flags. This # register, intr-mbox-0, provides a superset of the function provided # by the mask-pci-int and clear-pci-int bits in the misc-host-ctrl register. # # Furthermore, the documentation clearly implies use of this register, # as an indicator that the host [tg3 driver] is in its interrupt handler. # # The new tg3 logic, taking this knowledge into account, masks-and-clears # irqs using intr-mbox-0 [only] when a hard irq is received, and # unmasks-and-clears irqs at the end of tg3_poll after all NAPI events # have been exhausted. # # The old logic twiddled the misc-host-ctrl irq masking bits separately # from intr-mbox-0 bits, which was not only inconsistent but also # a few additional I/Os that were not needed. # -------------------------------------------- # 03/01/17 jgarzik@redhat.com 1.884.44.7 # [netdrvr tg3] flush irq-mask reg write before checking hw status block, # in tg3_enable_ints. # -------------------------------------------- # 03/01/17 jgarzik@redhat.com 1.884.44.8 # [netdrvr tg3] manage jumbo flag on MTU change when interface is down # -------------------------------------------- # 03/01/17 jgarzik@redhat.com 1.884.44.9 # [netdrvr e100] remove file e100_proc, missed in previous patch (standard stats) # -------------------------------------------- # 03/01/17 trond.myklebust@fys.uio.no 1.884.45.1 # [PATCH] Fix Oopsable NFS condition in 2.4.21-preX # # nfs_release_request() can currently Oops when attempting to # dereference req->wb_inode if the inode has been released prematurely. # This can occur when we call to nfs_clear_request() in the read or # write callbacks. # # The following patch moves the culprit test (which is only a debugging # statement anyway) into nfs_clear_request(). # # Also change the remaining if () BUG(); into the more efficient # BUG_ON(); form. # # Cheers, # Trond # -------------------------------------------- # 03/01/17 marcelo@freak.distro.conectiva 1.895 # Merge http://jfs.bkbits.net/linux-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/17 marcel@holtmann.org 1.884.46.1 # [Bluetooth] Remove wrong check for size value in rfcomm_wmalloc() # # This patch removes the wrong and not need check for the size value # in the function rfcomm_wmalloc(). The check is not needed because # it will be always called with a minimum value of RFCOMM_SKB_RESERVE. # -------------------------------------------- # 03/01/16 maxk@qualcomm.com 1.884.40.3 # Merge bk://linux-bt.bkbits.net/marcel-2.4 # into qualcomm.com:/usr/src/linux-2.4 # -------------------------------------------- # 03/01/17 jfs.adm@hostme.bitkeeper.com 1.894.1.1 # Merge bk://linux.bkbits.net/linux-2.4 # into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.4 # -------------------------------------------- # 03/01/17 david-b@pacbell.net 1.884.42.33 # [PATCH] usb root hub strings # # Someone changed the "get string" logic to use short reads, # not long ones, a while back. That broke many root hub # string accesses (not through tools like "lsusb"!) because # that logic didn't handle short reads quite right. # -------------------------------------------- # 03/01/17 henning@meier-geinitz.de 1.884.42.34 # [PATCH] : scanner.h, scanner.c: maintainer change # # This patch changes the maintainer from Brian Beattie to Henning # Meier-Geinitz and adds a link to the documentation and website. # -------------------------------------------- # 03/01/17 shaggy@shaggy.austin.ibm.com 1.894.1.2 # JFS: replace ugly JFS debug macros with simpler ones. # # JFS has always used ugly debug macros, jFYI, jEVENT, & jERROR. I have # replaced them with simpler jfs_info(), jfs_warn(), & jfs_err(). # -------------------------------------------- # 03/01/17 gibbs@overdrive.btc.adaptec.com 1.884.1.93 # Aic7xxx and Aic79xx DV fix: # Don't bother with DV if the device can only do async # -------------------------------------------- # 03/01/17 gibbs@overdrive.btc.adaptec.com 1.884.1.94 # Aic79xx Driver Update # Enable abort and bus device reset handlers for both legacy # and packetized connections. # -------------------------------------------- # 03/01/17 marcelo@freak.distro.conectiva 1.896 # Merge bk://linuxusb.bkbits.net/marcelo-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/17 ak@muc.de 1.897 # [PATCH] x86-64 update # # Sync the x86-64 port with x86-64.org CVS. # # Changes only x86-64 specific files # # Lots of bugs fixes and some cleanups: # - check CPU feature flags # - IOMMU leak tracing # - Fix bug in 32bit FPU signal restore # - Enlarge address space for 32bit programs to nearly 4GB # - Make MAP_32BIT only access the first 2GB to handle signed 32bit relocations # in small code model. # - Sync 32bit emulation with 2.5 port # - Make timers more reliable, support HPET (Vojtech Pavlik) # - Make discontigmem memory map handling more robust # - Fix scheduler race when segment reloading takes exceptions # - Fix context switch for fs/gs registers. # 64bit gs bases still have some problems, disabled for now. # - Move interrupt entry points into entry.S # - Fix problems in kernel exception handling. # - Support non executable mappings for user space and kernel. # User heap / data / stack defaults to non executable now. # - Optimize IOMMU code a bit by flushing less frequently # - Fix gs reloading in kernel # - Don't allow 64bit values in 32bit processes via ptrace # - Fix signal frame alignment bug # - Merge with i386 # - Fix bugs in unistd.h syscall stubs for 5 and 6 arguments # - Add readq/writeq # - Put modules into vmlist for /proc/kcore (needs more changes in generic code) # - Discard .eh_frame # - Some other fixes and cleanups # # Patch for 2.4.21pre3. Please apply. # -------------------------------------------- # 03/01/17 hch@sgi.com 1.898 # [PATCH] fix scsi module unload bug # # Another one where Pete added the right comment without actually fixing it :) # # We only set blksize_size, so we need to reset that one, not blk_size. # -------------------------------------------- # 03/01/17 gibbs@overdrive.btc.adaptec.com 1.884.1.95 # Aic7xxx Driver Update: # o Determine more conclusively that a BIOS has initialized the # adapter before using "left over BIOS settings". # o Adapt to upcoming removal of cmd->target/channel/lun/host in 2.5.X # o Fix a memory leak on driver unload. # o Enable the pci_parity command line option and default to pci parity # error detection *disabled*. There are just too many broken VIA # chipsets out there. # o Move more functionality into aiclib to share with the aic79xx driver. # o Correct a few negotiation regressions. # o Don't bother doing full DV on devices that only support async transfers. # This should fix a few more of the reported problems with DV. # # Aic79xx Driver Update # o Add abort and bus device reset handlers. # o Fix a memory leak on driver unload. # o Adapt to upcoming removal of cmd->target/channel/lun/host in 2.5.X # o Correct a few negotiation regressions. # -------------------------------------------- # 03/01/17 johnstul@us.ibm.com 1.899 # [PATCH] Compensate lost ticks in x440s # # Marcelo, # # Occasionally due to SMIs issued by the service processor, x440s will # lose an interrupt or two. This can cause gettimeofday time # discontinuities as well as clock skew (due to jiffies not being # incremented when needed). This patch uses the cyclone timer to notice # these lost ticks and compensate for them. It only affects systems using # the cyclone timer (x440s only at the moment). # # Please apply. # # thanks # -john # -------------------------------------------- # 03/01/17 georgn@somanetworks.com 1.900 # [PATCH] Fix /proc/slabinfo on ARM # # On Wed, 27 Nov 2002 22:42:42 +0000 # Russell King - ARM Linux wrote: # # Ok, then. Here's a simple patch against 2.4.19 (I'd prefer to clean it # up more, but then I'd get flamed for gratuitous whitespace changes, so # here's the bare minimum). # # Marcelo, in case you missed it, this patch fixes the problem that _all_ # the slabinfo entries on ARM platforms show up as "broken". Please apply. # # ===== mm/slab.c 1.14 vs edited ===== # -------------------------------------------- # 03/01/17 gibbs@overdrive.btc.adaptec.com 1.884.1.96 # Aic7xxx and Aic79xx Driver Update # Force an SDTR after a rejected WDTR if the syncrate is unkonwn. # -------------------------------------------- # 03/01/17 david@gibson.dropbear.id.au 1.901 # [PATCH] Squash warnings in init/do_mounts.c # # Marcelo, please apply: this patch squashes some incorrect format # designator warnings in init/do_mounts.c. These seem to have been # fixed already in 2.5. # -------------------------------------------- # 03/01/17 ak@muc.de 1.902 # [PATCH] hammer support for i386 # # Add Hammer support to the 32bit i386 port. # # Mostly just reuses existing Athlon code and adds checks for model number # 15 there. # # I made it a new config option, but it is currently identical # to CONFIG_MK7 # # Also removed an old CONFIG_SIMNOW check that isn't needed anymore. # # Patch for 2.4.21pre3. Mirrors similar 2.5 changes. # # Please apply. # # -Andi # # Index: arch/i386/config.in # =================================================================== # RCS file: /home/cvs/Repository/linux/arch/i386/config.in,v # retrieving revision 1.15 # -------------------------------------------- # 03/01/17 marcelo@freak.distro.conectiva 1.903 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/01/19 jamie@shareable.org 1.884.33.4 # [SPARC64]: Fix MAP_GROWSDOWN value, cannot be the same as MAP_LOCKED. # -------------------------------------------- # 03/01/19 akpm@digeo.com 1.884.33.5 # [SPARC64]: Handle unchanging _TIF_32BIT properly in SET_PERSONALITY. # -------------------------------------------- # 03/01/19 akpm@digeo.com 1.904 # [PATCH] sync_supers() race fix # # After acquiring ->s_umount, sync_supers() must check sb->s_root(), to make # sure that the fs wasn't unmounted while we waited for the semaphore. # # Documentation/filesystems/Locking | 2 +- # fs/super.c | 2 +- # 2 files changed, 2 insertions(+), 2 deletions(-) # -------------------------------------------- # 03/01/20 green@angband.namesys.com 1.903.1.1 # reiserfs: iput deadlock fix - do not call iput() from inside of transaction # -------------------------------------------- # 03/01/20 jfs.adm@hostme.bitkeeper.com 1.903.2.1 # Merge bk://linux.bkbits.net/linux-2.4 # into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.4 # -------------------------------------------- # 03/01/20 gibbs@overdrive.btc.adaptec.com 1.884.1.97 # Aic7xxx Driver Update 6.2.28 # o Add some more DV diagnostic code # o Fix bug that caused sequencer debug code to be # downloaded always. # # Aic79xx Driver Update 1.3.0.RC2 # o Correct a bug that effectively limited DV to just ID 0. # o Add some more DV diagnostic code. # o Misc code cleanups. # -------------------------------------------- # 03/01/20 rth@dot.sfbay.redhat.com 1.903.3.1 # [ALPHA] Add debugging access (core and ptrace) to the # PAL unique value. # -------------------------------------------- # 03/01/20 agrover@groveronline.com 1.884.43.4 # ACPI: S4BIOS support (Ducrot Bruno) # -------------------------------------------- # 03/01/20 agrover@groveronline.com 1.884.43.5 # ACPI: Move drivers/acpi/include directory to include/acpi # -------------------------------------------- # 03/01/21 shaggy@shaggy.austin.ibm.com 1.903.2.2 # Merge jfs@jfs.bkbits.net:linux-2.4 # into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.4 # -------------------------------------------- # 03/01/21 bjorn_helgaas@hp.com 1.884.38.2 # i386: Fix enable_acpi_smp_table merge botch. # -------------------------------------------- # diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c Wed Oct 8 09:08:23 2003 +++ b/arch/i386/kernel/setup.c Wed Oct 8 09:08:23 2003 @@ -175,6 +175,8 @@ static u32 disabled_x86_caps[NCAPINTS] __initdata = { 0 }; extern int blk_nohighio; +int enable_acpi_smp_table; + /* * This is set up by the setup-routine at boot-time */